Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 22 Sep 2006 16:22:18 +0000 (17:22 +0100)
committerSteven Smith <ssmith@xensource.com>
Fri, 22 Sep 2006 16:22:18 +0000 (17:22 +0100)
commit262ad8a909859f187be885fb1f95dcf2928b6a36
tree61abc1f1292b54b0f90a76821b0b7dfcb277db46
parent380a06d426b8b90d3e9f63934b3c8a0e08599085
parent3b61bd783aaf458ecbffac2bd556e3f33a631419
Merge.